From 51eb87f3bd1dcc4992e1e5222405781c40ac34c1 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sat, 24 Nov 2001 21:05:10 +0000 Subject: [PATCH] don't deactivate menu when menu_item isn't sensitive (#61389) Sat Nov 24 22:05:27 2001 Kristian Rietveld * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't deactivate menu when menu_item isn't sensitive (#61389) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkmenushell.c | 2 ++ 8 files changed, 37 insertions(+) diff --git a/ChangeLog b/ChangeLog index abe4f03913..093f0add51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Nov 24 22:05:27 2001 Kristian Rietveld + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't + deactivate menu when menu_item isn't sensitive (#61389) + Sat Nov 24 15:35:26 2001 Kristian Rietveld * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index abe4f03913..093f0add51 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Sat Nov 24 22:05:27 2001 Kristian Rietveld + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't + deactivate menu when menu_item isn't sensitive (#61389) + Sat Nov 24 15:35:26 2001 Kristian Rietveld * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index abe4f03913..093f0add51 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Nov 24 22:05:27 2001 Kristian Rietveld + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't + deactivate menu when menu_item isn't sensitive (#61389) + Sat Nov 24 15:35:26 2001 Kristian Rietveld * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index abe4f03913..093f0add51 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat Nov 24 22:05:27 2001 Kristian Rietveld + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't + deactivate menu when menu_item isn't sensitive (#61389) + Sat Nov 24 15:35:26 2001 Kristian Rietveld * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index abe4f03913..093f0add51 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Nov 24 22:05:27 2001 Kristian Rietveld + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't + deactivate menu when menu_item isn't sensitive (#61389) + Sat Nov 24 15:35:26 2001 Kristian Rietveld * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index abe4f03913..093f0add51 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Nov 24 22:05:27 2001 Kristian Rietveld + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't + deactivate menu when menu_item isn't sensitive (#61389) + Sat Nov 24 15:35:26 2001 Kristian Rietveld * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index abe4f03913..093f0add51 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Nov 24 22:05:27 2001 Kristian Rietveld + + * gtk/gtkmenushell.c (gtk_menu_shell_button_release): don't + deactivate menu when menu_item isn't sensitive (#61389) + Sat Nov 24 15:35:26 2001 Kristian Rietveld * gtk/gtktreemodel.c (gtk_tree_model_foreach): free path before diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c index 65626e0018..7f3deea037 100644 --- a/gtk/gtkmenushell.c +++ b/gtk/gtkmenushell.c @@ -469,6 +469,8 @@ gtk_menu_shell_button_release (GtkWidget *widget, return TRUE; } } + else if (menu_item && !GTK_WIDGET_IS_SENSITIVE (menu_item)) + deactivate = FALSE; else if (menu_shell->parent_menu_shell) { menu_shell->active = TRUE; -- 2.30.2